added check user in entity query
updated calendar entity