Also filter by app_id