#166586 by hswong3i: move literal values out of menu module queries (for better db compatibility, ie. easier query rewriting)