Expanded card list functionality, added tests, refined complex search
Merge remote-tracking branch 'origin/master'