Fixed conflict with date/filter selectors
Fixed conflict with date/filter selectors

kingsman142/PantherView,kingsman142/PantherView,brlodi/club_project_2017,dzheng256/club_project_2017,SPN11/PantherView,Pitt-CSC/PantherView,dzheng256/club_project_2017,Pitt-CSC/PantherView,SPN11/PantherView,dzheng256/club_project_2017,SPN11/PantherView,brlodi/club_project_2017,brlodi/club_project_2017