Reworked filtering into separate APIs and views. Need to rework searching next