Some refinements to the point assessment tool. Split assesssment query from the refined range map query to improve performance.