Improving search by id - stopping the search on the first match. It closes #1
Fix code style inconsistency with tuples