Bug Fix: Device/User search filtering and sorting