Small fixes. Starting to work on filtering