Return all keys if none specified (2)

Didn't test before. This works now though.