Updated domain
Fix searching for item by id
Minor style updates