Add Auth filters and some fixes

Add Auth filters and some fixes