fixed duplicate results
Merge branch 'double_result_fix' into dev