Add guard and focus filtered