implemented support for mapped query.