fix filtering + improve workflow
improve navigation