Moved user filter field to a separate view, updated the model