Simplify the shit and make it work better by having a single data request and the filter..