Update for remote permission checks for not breaking the listings