Added filtering to requests (This should have been included from the get-go, I just ignored it for a bit)