first stab at filter navs
big fixes and speed improvements