Fixed and changed implementation of filters