adding valid support for map.
adding db query string