Filter fix

Fix for user selection