Added activeOnly query param and functionality