added tab filter + corrections