Fixes #16. 

Added searching for pluralized terms during layer generation.