Added type and status selectors