Add filtered query to types