Added initial work for search by actual geometry