Fix key filtering, now filters by prefix