fix
cleanup
filter for different users