Readded user locations, now with markers.  Also fixed filter pathing issues.