Refactored the PropertyQuery class, used SQL BETWEEN.