Added user-specific data for radius and state filters
Merged changes