search expressions/comparisons greatly improved, ready for deployment