Updated query to utilize spatial joins on indexes

This method is much faster than using ST_Intersects.