Made feature set more robust. Added user filter function