refactored events queries into model
bug fixes & updates from call with Tristan
fixed eventPrefs and eventRestrics