- added another byId query method with Option