Started post filter functionality

+ code cleanups