Added support for search by ONLY ID