Code Cleaning: Removed dependency of existing postgis selection