add username filtering and test