Tidied up SearchByPointCommand