That's exactly why we should get rid of all those 'custom cases' remapping code, it's hard enough to keep a single place (library_query.c) up to date and 100% valid, but having more areas doing their own remapping is just impossible to maintain... Some day...