improvements for multi field selections
improvement draw map call