Add controller filter - some general cosmetic changes