Source API fix

Source API failed to function as required. The current MR changes the SOLR Query building process to reuse the search query to find the correct item by id. It also fixes the case of failure when no record is found in SOLR for a given id

Closes #128 (closed)