Added filter support for what the models return to the api, cleaned up a little