Add map queries to search

see how i did it for emibot here