add user-entry and filter correctly on resources, closes #26