Cleanup of meal sorting
Updated Filter VC to use new model