FAQ enhancements #297 #292