Improved Database select and gettext scanner