More regex tuning; fixed a bug where searching for a field that doesn't exist caused a crash.