fixing filter navigation, adding two call too