Some changes.

Added point(small circle) query.
Changed the whole query functionality.