Change LIMIT in DB query respectively remove where not necessary
Add Index to properties table for better performance on upgrade