case 2478 ting_search - Custom ranking only when custom ranking is enabled, ranking field is enabled and the option chosen for sorting is custom ranking(in other words empty).
case 2478 - Space removal.
Merge branch 'case-2478-ting_search' into develop