Adding query for in and around area search