Updated Catel and Orc.FilterBuilder